Update debian/gbp.conf

diff --git a/debian/gbp.conf b/debian/gbp.conf
index c17ca62a309376ba44dc46f1a28eb155318924c1..a68ffd535b878078beacf4713a24d235d076dd27 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,15 +2,16 @@
 pristine-tar = True
 debian-branch = debian/master
 upstream-branch = upstream/latest
-# Use gbp import-orig --uscan --upstream-vcs-tag=BABL_0_1_56
-# for instance when upgrading to 0.1.56. See https://bugs.debian.org/908316
-upstream-vcs-tag = invalid
 
 [buildpackage]
 sign-tags = True
 
+[dch]
+multimaint-merge = True
+
 [import-orig]
 postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
+upstream-vcs-tag = BABL_%(version%.%_)s
 
 [pq]
 patch-numbers = False